Merge pull request #18 from senkin/master

Master configs for 2012
Merge pull request #19 from senkin/master

Bugfixes