First Commit. In major development stage. Bugs included
Merge origin/master