Merge pull request #10 from surreal8/master

adding back changes from 3/21 commit that were accidentally deleted