Merge pull request #97 from paulcpederson/master

STyles n stuff