Fixes #7. Also resolves missing constructor issue.
Merge branch 'master' of https://github.com/rcythr/archive