#185 for edits
Merge pull request #329 from unicorn-ljw/master

#185 for edits