Merged pull 20