Merge pull request #5 from riabop/develop

Develop
Merge pull request #6 from riabop/develop

Refactoring and adding a timer and more functionality. Forever and ever me and myself agree with this.
Merge pull request #7 from riabop/develop

Develop
Merge pull request #8 from riabop/master

down with big brother