Merge pull request #17 from zephyrz4/master

Reorganization
I fixed my retard. boolean values reset to lowercase.
Attempt 2 at merging right.