add & fix
fix
add
Merge pull request #5 from sgrastar/working-branch-for-Alpha3

archived alpha3.