Merge pull request #7 from argandas/master

Update branch
Merge pull request #8 from argandas/Dev1

Merge pull request #7 from argandas/master