Merge pull request #12 from DEVELDESK/master