Milestons alpha

This pull request will close Issues #128 and #132