Release 1.3.6
* fix bug #1
* fix bug #2