Merge pull request #3 from digitecture/master

Master
Merge pull request #4 from digitecture/tempmaster

Merge pull request #3 from digitecture/master