Merge pull request #24 from CrouseMatthew/Matthew

Matthew
fixed float
final touches
final