change to allow longer periods
Merge branch 'newadmm' of http://github.com/xumiao/pymonk into newadmm