ddd
i
Merge pull request #1 from milk-dropper/feature/bugfix

bugfix
Merge pull request #3 from xharing7/release_20140611

Release 20140611