Bailey Ling 68331a5e4f Merge branch 'dev'
Implements #204.

Conflicts:
	README.md
2013-08-31 15:02:01 +00:00
..
2013-08-31 15:02:01 +00:00