Merge pull request #13 from ka2m/master

Release Preparation