Add new functions and update from MarkSamman
Merge pull request #94 from Jonas21/patch-10

Add new functions and update from MarkSamman