Merge pull request #7 from ALPHA-60/master