commit 2013.12.28

bug fix