Merge pull request #14 from pmur002/master

minor improvements
improved functions
small fixup