#14 applying changes to dev branch