Merge pull request #15 from mjohnson541/master

remerging