Adjustments to make things more ideomatic.
Version 0.2.5
Version 0.3.0-SNAPSHOT