Merge pull request #127 from ndawe/master

[MRG] refactor package structure and add new utility functions