merges with arash mousavi's pull request
--amend