Merge pull request #42 from JohnKFisher/Development

0.2 merge