v.0.2.5
Merge pull request #27 from jcbnlsn/master

v.0.2.5