Merge pull request #3 from digitecture/master

Master