Merge pull request #50 from jkuk/master

minor formatting changes for testing purposes
got dailton's panel updating properly
Merge remote-tracking branch 'upstream/master'