Merge pull request #12 from FWAJL/Development

Merge pull request #11 from FWAJL/master
Update .gitignore
Merge pull request #13 from FWAJL/master

Master to DEV