Progress. Slow yet good progress.
Merge pull request #21 from SonOfLysander/master

Progress. Slow yet good progress.