Merge pull request #4 from pnegahdar/develop

Develop
Merge pull request #6 from pnegahdar/develop

Develop
Merge pull request #7 from pnegahdar/develop

Develop
Merge pull request #11 from pnegahdar/develop

Develop
Merge pull request #12 from pnegahdar/develop

Develop
Merge pull request #16 from pnegahdar/develop

Develop
Merge pull request #17 from balanced/develop

Fixed naming
Merge pull request #19 from balanced/develop

Develop
Merge pull request #20 from balanced/develop

Develop
Merge pull request #21 from balanced/develop

Full functioning API first version
Merge pull request #26 from balanced/develop

Develop
Made changes, now fixing
Fixed alot of the imports