Merge pull request #141 from cptmashek/master

Major refactoring
Merge github.com:scoundrels/scrib