Updated; marked as inactive.
Merge pull request #7 from jonfaustman/develop

1.2.0