Little bug fix
Another little bug fix
Add build and dist folders
Merge origin/master