added new methods
merging fdewaghe new methods into dev
Merge pull request #6 from birdbum/dev

Dev