Merge pull request #1 from mpetris/master

latest features and bugfixes
solved ref #67
Merge pull request #86 from catmadevel/issue67

Issue67