Merge pull request #2 from skazer/master

bring development up to date