Merge pull request #4 from starverte/master

Merge from master
Merge pull request #43 from mbeall/master

Merge pull request #4 from starverte/master