13-11-2013 #2
Merge pull request #2 from cre8aweb/dev

13-11-2013 #2