Merge pull request #15 from ithielnor/master

Added new features up to 1.0.74