Merge pull request #11 from sleepers-anonymous/master

Pulls pretties up to where Master is
Merge pull request #12 from sleepers-anonymous/pretties

Merge pretties into Master