Merging issue-11 to development branch

#11