Move a couple method calls to be in the client only, closes issue #2
Merge remote-tracking branch 'origin/master'