Merge pull request #2 from sandstroh/sandrosbranch

Several changes...
added .idea folder