putting all back
Merge pull request #3 from vladan-arraystudio/test-branch

putting all back