Merge pull request #1 from andresmihkelson/development

Adding new features from devel.