Test commit to make sure automatic merging will work, or if I have to
re-fork.
Merge pull request #109 from msummers123/master

Test automatic merge, also bug fix for the sink settings and prepare structures for new features