Merge pull request #23 from warped-rudi/master-updates