merge with master and kendalls fix
Merge pull request #62 from tleung999/tony

merge with master and kendalls fix