* tsk-79: Changed return type of function and cleaned up other functions * tsk-79: Version bump * tsk-79: Code formatting