Uploading work
minor bugs
Merge pull request #22 from Align/master

match to master