fixed #8
fixed #4
Merge commit '3403e3f'
Merge commit '721ebbc'