Made the system less complex and reduced the code size
Merge pull request #5 from Xeoncross/master

Made the system less complex and reduced the code size