Merge pull request #18 from marco64bit/develop_fix

Develop fix