Merge pull request #1 from Talicada/Development

Lets break things