Merge pull request #245 from skrenek/master

Mostly development changes