functional
Fix merge conflict.
Commit before merge.
Fix merge conflicts.
Merge pull request #22 from krauzer/cassie

Cassie