Merge pull request #139 from claudius108/master

Restored some functionality