Merge pull request #44 from Magenic/master

Merge pull request #167 from jwendl/master
Merge pull request #45 from Magenic/master

Updating my local repository.
Merge pull request #46 from Magenic/master

Merging changes to my local fork.
Fixing issue #170
Fixing issue #168
Merge pull request #175 from jwendl/master

Fixing issues 170 and 168