Alpha fixes for #3 and #18
Merge pull request #21 from Lukenickerson/master

Alpha fixes for #3 and #18