2nd feature commit.
Finished 2nd feature.
Merge branch 'release/0.0.2'