fixed typo
changed version number setup
fixed style
simplified default case considerably.
fixed import error
fixed bug in initialization of public heartbeat that caused the same public heartbeats to evaluate to not equal.
fixed merge conflicts
fixed typo
Merge pull request #18 from wiggzz/devel

Small bug fixes